Modularisation of Sequent Calculi for Normal and Non-normal Modalities